Fixed CRUD flows