Update to test relationship isset too