Added modeling of oxygen