Added support for additional user-defined mappings when using mapping factory