Replace Envelope2D by Envelope, simpler to use.