Modifications for mtz-basic