Handle assoc relations properly and also use assoc.target to be safer