Added polymorphism and order for filters