Added JSR305
JSR305 annotations added to increase code stability