Added filtering classes to core