@witty-crayon-22786 +1 using decorators to clean up payloads, I think that’d be much nicer and make inheritance cleaner also.