Restructure SupportedSensors