Added support for Component Filtering