Improve annotation checking