Refactoring + Full CRUD