Goaway support added