Refactored DynamicFactory content and references to it