Update annotate and add cancan