Added additional types for importing and unknown