Adding defaults and geolocation