Final work on CreateNewEntityWhileEditing