Updated CRUD functionality