changes related to centralizing construction of invokables