DAO and Service base classes modified