Added selection logic and accessory type