WIP: Add composite filter