Added token groups to tokens array. Related to #45.