Improve OSGi metadata