add type status field
Merge branch 'history'