Improved modularization.