[modularization] Update