Expand mapping of 082 to normalized classification