Merge "Add mode info arrays and mode info index."