Introduce gateway choice type