Further work on modularization