Add gateway support on the directory as well.