Not sure I like the added complexity to an already super-complex hydrator… I'll try to carefully review this later.