Improve modularity