Added osgi and eclipse support