Adding a Locations wrapper