Reworked CRUD operations a bit