More jsr305