- Enhanced menu for entity and objects (not done for now)