add gateway"s support