Refactor saveAll