Corrected column names and types