A little bit more modular