#40 #44 - Rework the LocalModule