Added some stuff for ASYNC (Incomplete)