add missing fields

add missing fields
Merge branch 'dev'