Move the entities dictionary to the main map. In the future we should remove this and replace the references with key references.