Added some further configuration options