Updated assignment structure