Updated OSGi and Documented