Updated Firewall with changes taken from L-3 switch