put-mapping small fixes and support for nested structs