New tables and models for CO2 calculator