Added some async validation