Upgrade to annotations. Adds uniqid for identifying.