Made all methods async