Added Token Class - Not Complete