Added XML annotations