Feature/zenrun upgrade