Update for the new struct