Added three new columns to data query