Add :mapper_class option
Merge branch 'mapper_class_option' into various_fixes
Expose attribute names