Add gateway choice type