changed properties for production
changed properties for production v2
Refactored loading of properties