add FsSql

minor refactoring