Changed the pickle strategy to avoid delayed constructions.