Added configuration and logging elements