Updated the configuration to make sure that the devices are properly setup