Added groups, sensors and icons