Adding few more classes

Updating old classes with better attribute names.