Refactored symtab