Added filter functionality to default classes