Class structure changes