added support for selectedClass