Modularization and improvements.