Makes Externalizable support more complete