Added back lat and lon fields