Refactoring for compatibility with resourceNode