fixed Dao and Service methods