Updated .zero classes