Merge "Add columns for snapshot table"