Token object, redesign