Storage fixed and refactored