Updated CRUD tasks with the new changes and refactored old code