Fixed service and DAO