small refactoring to allow cross-refs between objects