Added in some missing annotations