Fix self references
Factory class mapper functions can be overriden