Added update class handler