Added filtering by class