Added more configuration support