Added recursive config merging