Improved work with scanning fs