Add support for opting out of data mapping
Optimize use of Array#map