Adding in more plugin enhancements

Change-Id: I4eb862002621ede8654750d4e032bafd807b616f