FIXED: fixed the many to many associations and populate