Expanded TypeSymbol mapping to support more primitive types. Added related tests.