Revise `Import` implementation

This feels a lot better.