Improvements to entity annotation