Add missing code for Multi export