Better annotation