Update to fix issues with multiple custom relationship tables for models