Add SubjectSelector class