Adding annotations for more admin APIs