Restructure for direct update.