Updated annotations for java2sdg