Refactor Hash Delegator