Added mapping for column names, fixed column lenth mapping