Added support for cycles and updated the names of a few other xml tags.