generics: consistency in attributes map, missing generics in TokensList