removed join table, added inverse mapping