Update classes
Update header