add basic .Z support