Moved other CRUD methods to main type