new edit module, fix creating entities