Added wgs84 support