improve nesting, implement missing entities with nested properties