Added additional code to support COA support coming in WET 4.04