Follow up patch that implements versioning for index updates