Cleanup SymbolResolver
and make it more extensible
#2001
Merged
SymbolResolver
and make it more extensible
#2001