Improve EDS integration.
Refactor bento controller: first pass.