Added in more configuration options