Updates to include Gateway subnet