improve symbol/table/catalog support