Add entity version and handle