Unique entity IDs are now optional