Added basic configuration options
Added basic configuration options