Add other struct types