[DependencyInjection] Tweaked factories