Gateway generation now emulates old functionality