Some more work on imports