Update to work with new unique definitions.