add a few new items
Remove Name: key in favour of <Name>: key in struct entries