Added validations and OpenStreetMap