Refactoring to be match Camels API.