ECO mapping updates (C82, C83)