Further modularization