Added missing domains for variables of type choices