Add new filtering attributes and deprecate old