Moved output to OnUpdateOutputData() and updated the XML files