Improving annotation support