Add support for new status field

Change-Id: I559498d9ce3be7f8e19231195f618e1b46c3110c