Class-based version tweaks