Update plugins improvement

Change-Id: I27ac3709ae0ab7a2aacd9f1cb0d6856e9c2bec5d