Fully moved to the zaet api