Adding more configuration options