Continue implementing relationship support