Make things a bit more modular