Added ClientSelectOptionsGenerator