Improve ServiceLoader