Small changes for annotation library api.