Added some additional annotations to existing plugins