Adding the Fluent Interface support and refactoring the ESB components (not finished).