Add system envelopes and allow the api token to be specified