Initial work towards add-entity dialog