Added broker and plugins