Modified toolkits to use reverted IFunction schema