Re-organised assignment structure.