Modified settings to be production-level