Added more configuration