Add service factory providers.
Fix missing namespace usage.