Make importing work better