Added the service and DAO base classes