Added getting locations