CMIP improvements