Added selection capabilities