Exporting more types