Latest update with new relationships and unit tests