Added missing output args to increase consistency