More class changes