Updated with CRUD operations