Added columns to support market indices