Some additional work to make Module common