Modularization Improvements