added remaining devices to new configuration concept