Zvo/deprecation and upgrade