Added a bunch of configuration options