[STONE] going to branch for sql refactoring