Added some stuff for the zf