Added optional option for column mapping
Fixed mapping