Updated User associations
Temp stash to get back to old version