Fix #35: metadata index structure is changed