updated to include devices from newest firmware. CCU2 is now called "CCU2 System"