Added Fusion framework support