Updated xml snippets for consistency