Worked on CreateNewEntityWhileEditing