Re-factored models in business logic