Structure classes updated