Add OSGi bundle support