CRUD, refactoring templates, Bug fixing