add (optional) support for separate execution token