Update to Class structure