Add more functions to support FS, Csq