Added support for valid & invalid emails