Update status saving constructs
Update spec