Moving to a more modular approach