Improvements to modularity