Need to add by full name, due to ordering of loading (the name it's attached to may not be resolved yet!). This doesn't seem to cause any performance problems but we can revisit if it does.
