Improve VersionBuilderSpec