Reduce duplication in MBC code