Moved check for Edit Action into _AddAssignment