Add more configuration parsing code