Fixing previous version imports
Fixing previous version imports
Fixing osgi issue