Integration - Fix mapping