First version of the re-scan
Add missing FileSystem functions