Update to newer annotation requirements