Move token attribute to Configuration