[#1624] Update class definition and mixin.