Working towards discovery that is ServiceLoader compatible