Added latitude/longitude and refactored