Sort annotations
Minor syntax change
Update gems