#719 Making necessary changes to plugin infrastructure to support api based plugins