i think that fixing 3560 by unifying

Struct

hydration with how we currently do legacy

Target

hydration might actually have a positive impact on performance as well