Refactor to use wrappers for Hash storage.