Add support for missing fields that the CF can provide as indicated by