Added missing export keywords