Revised for new extended symbol table API