Added marionette generators