Prototype of new functionality to add entity while editing