For ENG-5865, Add missing classes that may not be long for this world