CORS and better modelling