Moved output to OnUpdateOutputData() and updated the XMl files