[update] Refactor Faker Helper