Add mockup version for Marionette support