Adding new devices and scenarios