Added supervisor and firewall