Update code to enable modules