GenericDAO, GenericService Refactoring