switch to FS.Store namespace and pass options
Merge origin/master