Enhance development/production settings
Enhance development/production settings