Vastly improved CRUD