Speed up annotations a bit