Replace Collections with OSGI Plugin usage