Class structure added