added optional classes filter