Added entity versioning