Changed Filter Signatures to be more consistent