Added boolean values, but has choice conflicts.