SOme changes to make it work with direct exchange