Updated type mapping dictionary