Add output struct (to be fixed)