[PATCH 1/3] Added support for plugins at client