Make the mapper work with underscores. Also add getters and setters for lat and longitude