CRUD architecture refactor