Adjusted module outputs so that it's easier to consume them when using the factory in a larger codebase.