Increased modularity and singleton stuff