Add flag for new file handling. Make Status an embedded object.