Refactor to use delegation to underlying hash