Better factory integration.