Fix naming and add new columns