Improve annotation model