Added in support for Locations and Controllers