Attempt to improve Index serialization