Addition of generic filter and output defines.