mb_type/sub_mb_type refactored