Added assignment functionality