Various updates in the class.