Added selection of inputs functionality