Refactor PointOfFailure object creation