Update comments for future developers
Extract the logic to collect original column names from attributes