@jds2501 @zacc has already mentioned that we cannot do this in a cleaner way until we move to app objects. Please let us know if you a better solution or approach that we haven't thought about yet, Thanks