Added asynchronous editing