Updated to composite columns.