Added some relationship code