Adjusted prototype/function generation