Added configuration options!