improve base osgi implementation