model association improvements