Configuration enhancement from G5