Updated Service and DAO classes