Adapt config parsing to handle defaults correctly