Added more configuration functions