add geofenceId support