Further modularization improvements