updated erd and associations