Moved to OSGI services.