Add FWaaS support