More modular design