Added support for filterAttributes