adding updated edge gateway support