Converting more code to zf2