Added z-schema to the implementations