Fixes and adding FS API