Adding async await where necessary