Some updates...
New index_format
Minor changes