[CRUD] Refactor over the crud operations