#5129 Extend export classes to allow for remote exports