Updated for the move to BFO 2.0