Rebuild, versioning rework