Implemented CRUD functions in more locations