Add model assoc

Updated models with shortcut associations.