Refactor out generic mbr