Other Const + Class Update

Other Const + Class Update