Adds support for non-scalar output types

And also adds `--import` arg.