Add support for missing status