Updated CRUD