Some reworking of XML annotations