Added configuration parsing