Enhance type mapping