OSGi - Cont'd tweaking