included remaining fields

#451