Add optimize service provider.

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>