Added changes to LocationManager and NotificationManager