Infrastructure updates
Add module file