Updated to new function type structure API