Modelling opportunity data 2.0