Continue hard refactoring after DAL has been changed