Fixed types, added async