Refactored DAO and Service layer.