Add support for more value types
Add support for the struct item type