Added some missing annotations