* Future changes depend on this one * Also fixes the smell of "stateless" integration objects we had in the past