Annotations to cover a few more use cases