Adding location information (using CLLocationManager)
Refactoring