Work in progress allowing the entities to be easily overridden.