OutputData now using templates