Modularise to leverage fresh