Update DAO layer and add impl. for Service layer