DeviceConfigurator changes