PCT-766: Update structs