Check for resource wrapper, refactoring