Added configuration options

Added configuration options