INodesProvider, refactor