Refactoring harvest package