Adding support for multiple selects