Are you interested in a pull request to filter based on address fields (allow specific payment methods if the company field is filled) ? Or would that be out of scope?