Updating class names
Updating to latest framework