Condensed some MBS component blocks