Completed integration with Firewolf