Improved modularization