Switched to FilePathElementsProvider