Adding support for selected values