Added assignment checks