#385 Refactoring, factory methods should use selectors
#385 Fixing ambiguous Mapping - and Factory method selection