Add column mappings to classes I missed earlier