Need to merge defaults, not extend

This PR fixes an issue where defaults were being extended instead of merged.