Changed mechanism to manage Supported Devices' record