added pugins support

Change-Id: I6a75a17ecbbdfc78bb762d042103bf55350e240e