made Z models optional