Added data and renamed tokens