Tweaks for more modularity