Updated MessagePump to use endpoint as opposed to locators
updated version