Adapting bi-objective class to the new API