Add support for the upcoming '' annotation change, while maintaining support for older cores