updated to correctly handle associations on hydrate