Fix field update to use struct