Refactoring to make the switch to allow attr-map to work
Merge branch 'master' into feature/enabling-attrmap
Allowing an optional map for the attr-map, not yet using it
Allowing attrmap parameter