Awesome, that MapKeyManyToMany was a bit of a hack that wasn't really recommended at the time this was done. Glad to see that go, especially without any schema changes.