Clean up Parameter integration with Module and Bundle factories