Adding defaults handling to enron app.
Merge branch 'enron-defaults'