Added some async stuff