Add more comprehensive email regex