Add default and wrapper references