@wkeese do you have input here? do we have a way for this to be place in a single method to be called both in programmatic & declarative case?