More generic export