Add Brocco, Marionette and refactor