Fix - Add option to export Virtual Fields