Fix broken example. More modifications on annotations