Add static version for marionetteing