Refactor from harvester spec