Now supports own debug tokens