Added more configuration options