Handle template functions better