Modularization changes