Replaced column definition map by list