Updated versioning to be more consistent