Further improved symbol table integration