Improves the factory & reduces http calls.