Refactored broker and install