Base: Improved OSPi support