Updated to current versioning