Move CRUD methods to main type