Update and add annotations