An extension of the Colombo phase transition model is proposed. The congestion phase is described by a two-dimensional zone defined around an equilibrium flux known as the classical fundamental diagram. General criteria to build such a set-valued fundamental diagram are enumerated, and instantiated on several equilibrium fluxes with different concavity properties. The solution of the Riemann problem in the presence of phase transitions is obtained through the construction of a Riemann solver, which enables the definition of the solution of the Cauchy problem using wavefront tracking. The free-flow phase is described using a Newell-Daganzo fundamental diagram, which allows for a more tractable definition of phase transition compared to the original Colombo phase transition model. The accuracy of the numerical solution obtained by a modified Godunov scheme is assessed on benchmark scenarios for the different flux functions constructed.