Changes for Return type change for INodeProvider