Well, this is why having it as an osgi service was useful - could have different implementations ;)

Not a big deal. Can we be done later.