Add more useful annotations