Extra classes from ZI