Add associations
Fix factories