Re-adding *.Type exports