Import latest z-* stuff from V