Refactor AbstractStorage