updated hydrator to correctly popupate associations