Change to classes-only version of BFO 2