Making things more modular