Updating XML format to comply with more standard output