Updated normalize (v3) & index structure