Added request cancelation + error codes