Added more configuration values