#410 Making necessary changes to  to support message based plugins api