Updated DAO and Service classes (3+3)