Configuration changes
Extend the app.config

Minor fixes