Add tag on struct and other change