Fix elements by adding datastore versions