Support for the entity editing system