[Spec] More use of VersionKit classes