Refactor internalSetHolder