Improved modular structure.