Improve annotations