Added CUI Selection support