WIP: edited ServiceLoader registration.