Added EDR, few configs