feat(model): Simplify logic