Reworking constructor hydrator