Refactoring to make it possible to add builders from OSGi bundles