Adding location and location factory.