Added activity and geolocation