Adds support for owned entities, contained entities and river items