Fixed overflow errors in the retirever. Added missing refactored producers.