Mapper class option

Apparently I never opened a PR with these changes.