Moved addLocations to Location namespace