adding scope and tokens