firm: Expand type mappings