Better handling of relations
Amends
Amends