Adds support for lat/long