Replace _.extend with _.merge to enable deep merging