Added f/s to the directory search
Added more methods