Use annotations instead of XML [Finishes #62211762]