Changing dependencies and adding osgi features