Updated to have unique column names