Removed calculateProperties for MultipleChoice and fixed new choice creation