FS components changed to reduce calls
Merge branch 'fs-alternative' into version_0.1