Refactoring to match Camel's API.