Updated with versioning data