Changes to fix crud operations