Refactor Inbound EP