VE-870 Use flag to assign extra class