Added support for mapping to custom class variable name