Adding insert and fixed issues in firewalls