Added Lat/Long support