Add gateway interface
Alter usage and options