Added support for latitude/longitude