refactoring inbound endpoint component