Updated validation regex