Change function templates to integrate with new function definition template