Update to latest v0.13-dev changes for structs