add missing fields
Merge branch 'staging'