merge

add some missing attr