Integrate express configuration changes.

Review first before integrate