Re-enabled Firo support