Refactored symboltable