More work on FS and FileManager