Improvements in annotations