Efficiency and modularity improvements.