Added a lot of new configuration options!