Add entities editing
Show entities
Merge simple_entities branch