Updated to include some (initial email providers)