Added fusion framework support