Date-wrapper improved