#385 Fixing ambiguous Mapping - and Factory method selection