Added Done and Error events