Make some functions async