Add clustering and firewalling