Split CRUD DAO methods and Search Methods
Merge from master