@kkennedydesign I agree, would be ideal. I think the challenge would be that some of those fields are used for legacy versions of SCA that are still in production.