Make it modular