Unique is now 'name' + '_type'... not just name
Make sure we capture subnet relationships on all things