Added some extra configuration options.