Reintegrated local cfg support