Updated for tokens
Added classes