Update for structs API change