Refactoring and improvements to column name mapping, mapping to attributes. See #37