Switches to using sets for hydrate and fields, as per Omar's suggestion