Changed method name
Added ability to configure mapping via configuration class