Refactored to include all OSGi dependencies from other Hobson modules.