Refactor Bussiness model