Create, update, delete added and other refactoring