Added envelope to the return info