Added selection of any state