Update to Factory rather than call Component directly.