more configuration options added