improved service plugin performance