#10 export types added