More robust import support