Added Images and Lon/Lat support