Changing xmap for resolve in intermediateClass.