Add some refactorings and SymbolTable