Added some more JSR305 annotations