Further modularizing