Update to work with Spring Integration