Adding MC-NIB support