Add option to enable custom lat, long