Adding logic for Yahoo