CRAFTERCMS-368 - Harvester Refactoring