New module FS Extra

Added new module
Bug fixes