Attempt to improve Index serialization

Attempt to improve Index serialization