Added special class changes