Adding custom modules to the mix