added rest of shorthand annotations