Added a few configuration options