Add WBB Faker as optional