Refactored forger collections