Added the initial parts of the framework for handling entities and
locations