Google Maps included and notification check added