Fix build and change to using exchange attributes