Added object classes and multiple selection queu