Enhanced return status mangagement

Enhanced return status mangagement