Import: Improve OSPi import support