ESB: Adjusted to use new requirements