Added Configuration Check