Use proper module
Bringing in missing configs
Use proper module