Added filtering by class and subclass