Added fx and futures