Fix update and some class (static var)