Added various configuration options
Added various configuration options