Improved modular build