Add MZ support

Add MZ support