Moved Network Gateway to issue 29